Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds WY & UPP Sentries #6327

Merged
merged 10 commits into from
Jun 14, 2024
Merged

Adds WY & UPP Sentries #6327

merged 10 commits into from
Jun 14, 2024

Conversation

Comxy
Copy link
Contributor

@Comxy Comxy commented May 23, 2024

About the pull request

This adds four versions of defenses WY branded for the PMC engineer. All WY defenses take longer to deploy. One of three can get picked by a PMC engineer:
Normal Sentry: shoots omni directional and slow.
Flame Sentry: shoots omni directional but with sticky napalm which is a worse fuel than blueflame.
WY Flag: same buffs as warbanner with more range but you cannot walk over it.
The other sentry a PMC engineer starts with by default.
Mini Sentry: like USCM but shoots faster with less damage.

Also adds an old type WY turret for future maps which has less dps but more health than other gauss turrets. I also made UPP versions of them.

I have tested the PR and everything works and is tested. I think everything is very well balanced, tested by me.

Explain why it's good for the game

I am tired of seeing USCM sentries on a WY facility. It doesn't make sense to me why they would not have their own branded sentries. This fixes that issue.

Testing Photographs and Procedure

Screenshots & Videos

Promo

Changelog

🆑
add: Adds W-Y branded sentries.
imageadd: Adds W-Y defenses sprites.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels May 23, 2024
@Zenith00000
Copy link
Contributor

This is cool. You think you could add a "sentry_holder" version as well for WY specific colonies? It would be a cool addition to a map I'm working on, although the current sentry_holder sentries are already pretty OP, I wouldn't recommend changing their values to make them even more overpowered. Either way good stuff.

@Comxy
Copy link
Contributor Author

Comxy commented May 24, 2024

Sure, sounds simple enough

Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the pure white sentries are too much. tone down the white into something more subtle. alternatively you could give them a unique (and more accurate) design entirely https://avp.fandom.com/wiki/Remote_Sentry_Turret

the logo on the flags should be W-Y yellow not orange

@Comxy
Copy link
Contributor Author

Comxy commented Jun 3, 2024

Toned down the white and also made UPP versions. I thought that sentry from the wiki looked more like a UPP sentry.

@Comxy Comxy changed the title Adds WY Sentries Adds WY & UPP Sentries Jun 4, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jun 4, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jun 4, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 13, 2024
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good now. sprites approved

@nauticall nauticall added Sprites Approved confirmed no stray pixels and removed Stale beg a maintainer to review your PR labels Jun 14, 2024
@nauticall nauticall added this pull request to the merge queue Jun 14, 2024
Merged via the queue into cmss13-devs:master with commit 3bca209 Jun 14, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jun 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants